Fix building with 3rd party OpenSSL:

morlovich · morlovich · commit 5b8253a2a7ae · 2016-01-28T11:13:43.000-05:00
don't incorrectly rely on boringssl directly from sha1 code, but rather go through our selector target (and similarly use it to find the includes) to find the ssl lib one is supposed to use. Fixes #1139 too
diff --git a/pagespeed/kernel.gyp b/pagespeed/kernel.gyp
@@ -116,7 +116,7 @@
       'dependencies': [
         'pagespeed_base_core',
         '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-        '<(DEPTH)/third_party/serf/openssl.gyp:openssl',
+        '<(DEPTH)/third_party/serf/select_openssl.gyp:select_openssl',
       ],
     },
     {
diff --git a/pagespeed/kernel/base/sha1_signature.cc b/pagespeed/kernel/base/sha1_signature.cc
@@ -23,7 +23,7 @@
 #include "pagespeed/kernel/base/string.h"
 #include "pagespeed/kernel/base/string_util.h"
 #if ENABLE_URL_SIGNATURES
-#include "third_party/boringssl/src/include/openssl/hmac.h"
+#include <openssl/hmac.h>
 #endif
 
 namespace net_instaweb {

Original file line number	Diff line number	Diff line change
`@@ -116,7 +116,7 @@`
`116`	`116`	`'dependencies': [`
`117`	`117`	`'pagespeed_base_core',`
`118`	`118`	`'<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',`
`119`		`- '<(DEPTH)/third_party/serf/openssl.gyp:openssl',`
	`119`	`+ '<(DEPTH)/third_party/serf/select_openssl.gyp:select_openssl',`
`120`	`120`	`],`
`121`	`121`	`},`
`122`	`122`	`{`